Update to rust master

diff --git a/Cargo.lock b/Cargo.lock
index 4327f02f2f2ba2eea209e00b4c0122faf7a5f667..0f94cf395b2a756556ec4c4c2dde195544a5d1b8 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,7 +13,7 @@ dependencies = [
  "semver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tar 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -32,7 +32,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -83,7 +83,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libssh2-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -101,7 +101,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -131,7 +131,7 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libressl-pnacl-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -180,7 +180,7 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]

diff --git a/Makefile.in b/Makefile.in
index 8ba2b4a6fd4a53ef16a5602ffe766661a9cc670e..fd03484a07714414aed49e4bede7dbd46261af0e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,7 +69,7 @@ all: $(foreach target,$(CFG_TARGET),cargo-$(target))
 
 define CARGO_TARGET
 cargo-$(1): $$(CARGO)
-       "$$(CFG_RUSTC)" -v
+       "$$(CFG_RUSTC)" -V
        $$(CARGO) build --target $(1) $$(OPT_FLAG) $$(ARGS)
 
 test-unit-$(1): $$(CARGO)

diff --git a/configure b/configure
index 69080b53a0a225101452f80df10638e84ed47926..6c724cc4bd0d15d79265f28094fb07e183c3b6ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -313,7 +313,7 @@ if [ $HELP -eq 0 ]; then
     else
         probe_need CFG_RUSTC        rustc
     fi
-    DEFAULT_BUILD=$("${CFG_RUSTC}" --version verbose | grep 'host: ' | sed 's/host: //')
+    DEFAULT_BUILD=$("${CFG_RUSTC}" -vV | grep 'host: ' | sed 's/host: //')
 fi
 
 valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 5a5c1b085832e6b22cdb870d67f31b12ff582f36..64dbe5a647d0cc1a4db7f4b496169303d32f64b2 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -1,5 +1,5 @@
 #![feature(phase, macro_rules)]
-#![deny(unused)]
+#![deny(warnings)]
 
 extern crate serialize;
 #[phase(plugin, link)] extern crate log;

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index fb93f7b2afc6c254293c482460c85f350929cbee..360e3279038cb66eb67419877bac28fa2419855a 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -3,7 +3,8 @@
 
 #![feature(macro_rules, phase)]
 #![feature(default_type_params)]
-#![deny(bad_style)]
+#![deny(unused)]
+#![cfg_attr(test, deny(warnings))]
 
 extern crate libc;
 extern crate regex;

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 82340b57584e96a3f657a0c88c3034e12cf2531c..115ee044368cdb0ca39be88e5e44f9ab9e32fa8b 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -468,7 +468,10 @@ fn rustc(package: &Package, target: &Target,
             t.is_lib()
         });
 
-        Ok((Work::new(move |desc_tx: Sender<String>| {
+        let rustc_dep_info_loc = root.join(target.file_stem()).with_extension("d");
+        let dep_info_loc = fingerprint::dep_info_loc(cx, package, target, kind);
+
+        Ok((Work::new(move |desc_tx| {
             let mut rustc = rustc;
 
             // Only at runtime have we discovered what the extra -L and -l
@@ -502,6 +505,8 @@ fn rustc(package: &Package, target: &Target,
                 human(format!("Could not compile `{}`.", name))
             }));
 
+            try!(fs::rename(&rustc_dep_info_loc, &dep_info_loc));
+
             Ok(())
 
         }), kind))
@@ -623,7 +628,7 @@ fn build_base_args(cx: &Context,
     }
 
     if profile.get_opt_level() != 0 {
-        cmd = cmd.arg("--opt-level").arg(profile.get_opt_level().to_string());
+        cmd = cmd.arg("-C").arg(format!("opt-level={}", profile.get_opt_level()));
     }
     if (target.is_bin() || target.is_staticlib()) && profile.get_lto() {
         cmd = cmd.args(&["-C", "lto"]);
@@ -676,8 +681,7 @@ fn build_plugin_args(mut cmd: ProcessBuilder, cx: &Context, pkg: &Package,
     cmd = cmd.arg("--out-dir");
     cmd = cmd.arg(cx.out_dir(pkg, kind, target));
 
-    let dep_info_loc = fingerprint::dep_info_loc(cx, pkg, target, kind);
-    cmd = cmd.arg("--dep-info").arg(dep_info_loc);
+    cmd = cmd.arg("--emit=dep-info,link");
 
     if kind == Kind::Target {
         fn opt(cmd: ProcessBuilder, key: &str, prefix: &str,

diff --git a/src/rustversion.txt b/src/rustversion.txt
index e4c3aa63cd174d0ac92ba9b07503ec62c9a850d6..e8ecf7efe7b36d107b73aa2c727679266bbb5d19 100644 (file)
--- a/src/rustversion.txt
+++ b/src/rustversion.txt
@@ -1 +1 @@
-2014-12-19
+2014-12-21

diff --git a/src/snapshots.txt b/src/snapshots.txt
index c20fbde3fda5f72587e4c3b206ba17bae51b76a3..f08e9d6ae731eccc1fd547b9c2d25c4e04c9a1bb 100644 (file)
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+2014-12-21
+  linux-i386 4dea04e278192c5409f43794a98f20a8f59df2d9
+  linux-x86_64 3e48c573d3c4d26591feb7bfe988174720f08374
+  macos-i386 dc3d498c0567af4a0820e91756dcfff8fde0efac
+  macos-x86_64 f301bd8c3c93a5c88698c69190e464af1525ac96
+  winnt-i386 5b6bc87e302d1ff6ac9b0576292eb7cbff2c3b83
+  winnt-x86_64 a8bb8d3a7ed3fc8caf4a33d6b9d2e43544877409
+
 2014-12-20
   linux-i386 1cccab5a6ac8e73472bf78cdce019cd1a60d4638
   linux-x86_64 53c176fcda0a40fb77b901303c443de3dce3e58d

diff --git a/tests/test_cargo_bench.rs b/tests/test_cargo_bench.rs
index ee957e80f641e7f19a11cdf8a14dfdc53288fea2..f9409eb7f92ddb6a0fd504dcb156966ca521b27a 100644 (file)
--- a/tests/test_cargo_bench.rs
+++ b/tests/test_cargo_bench.rs
@@ -181,7 +181,7 @@ running 1 test
 test bench_hello ... ",
         COMPILING, p.url(), RUNNING))
               .with_stderr(format!("\
-task '<main>' panicked at 'assertion failed: \
+thread '<main>' panicked at 'assertion failed: \
     `(left == right) && (right == left)` (left: \
     `hello`, right: `nope`)', src{sep}foo.rs:13
 ", sep = path::SEP))
@@ -646,7 +646,6 @@ test!(bin_there_for_integration {
                             output);
 });
 
-#[cfg(not(windows))] // FIXME(#456)
 test!(bench_dylib {
     let p = project("foo")
         .file("Cargo.toml", r#"
@@ -696,11 +695,11 @@ test!(bench_dylib {
                 execs().with_status(0)
                        .with_stdout(format!("\
 {compiling} bar v0.0.1 ({dir})
-{running} [..] --opt-level 3 [..]
+{running} [..] -C opt-level=3 [..]
 {compiling} foo v0.0.1 ({dir})
-{running} [..] --opt-level 3 [..]
-{running} [..] --opt-level 3 [..]
-{running} [..] --opt-level 3 [..]
+{running} [..] -C opt-level=3 [..]
+{running} [..] -C opt-level=3 [..]
+{running} [..] -C opt-level=3 [..]
 {running} [..]target[..]release[..]bench-[..]
 
 running 1 test

diff --git a/tests/test_cargo_build_auth.rs b/tests/test_cargo_build_auth.rs
index 80deaa2165557838688f7924bec013a6d63b1b9b..f390408e06c4b92659eac0560631136fd84df05c 100644 (file)
--- a/tests/test_cargo_build_auth.rs
+++ b/tests/test_cargo_build_auth.rs
@@ -1,6 +1,7 @@
-use std::io::{TcpListener, Listener, Acceptor, BufferedStream};
-use std::io::net::tcp::TcpAcceptor;
 use std::collections::HashSet;
+use std::io::net::tcp::TcpAcceptor;
+use std::io::{TcpListener, Listener, Acceptor, BufferedStream};
+use std::thread::Thread;
 use git2;
 
 use support::{project, execs, ResultTest, UPDATING};
@@ -25,7 +26,6 @@ test!(http_auth_offered {
     let mut a = listener.listen().unwrap();
     let a2 = a.clone();
     let _c = Closer { a: a2 };
-    let (tx, rx) = channel();
 
     fn headers<R: Buffer>(rdr: &mut R) -> HashSet<String> {
         let valid = ["GET", "Authorization", "Accept", "User-Agent"];
@@ -38,7 +38,7 @@ test!(http_auth_offered {
            .collect()
     }
 
-    spawn(move|| {
+    let t = Thread::spawn(move|| {
         let mut s = BufferedStream::new(a.accept().unwrap());
         let req = headers(&mut s);
         s.write(b"\
@@ -66,8 +66,6 @@ test!(http_auth_offered {
             "Accept: */*",
             "User-Agent: git/1.0 (libgit2 0.21.0)",
         ].into_iter().map(|s| s.to_string()).collect());
-
-        tx.send(());
     });
 
     let script = project("script")
@@ -122,7 +120,7 @@ Caused by:
 ",
         addr = addr)));
 
-    rx.recv();
+    t.join().ok().unwrap();
 });
 
 // Boy, sure would be nice to have a TLS implementation in rust!
@@ -132,11 +130,8 @@ test!(https_something_happens {
     let mut a = listener.listen().unwrap();
     let a2 = a.clone();
     let _c = Closer { a: a2 };
-    let (tx, rx) = channel();
-    spawn(move|| {
+    let t = Thread::spawn(move|| {
         drop(a.accept().unwrap());
-
-        tx.send(());
     });
 
     let p = project("foo")
@@ -175,7 +170,7 @@ Caused by:
             "SSL error: [..]"
         })));
 
-    rx.recv();
+    t.join().ok().unwrap();
 });
 
 // Boy, sure would be nice to have an SSH implementation in rust!
@@ -185,11 +180,8 @@ test!(ssh_something_happens {
     let mut a = listener.listen().unwrap();
     let a2 = a.clone();
     let _c = Closer { a: a2 };
-    let (tx, rx) = channel();
-    spawn(move|| {
+    let t = Thread::spawn(move|| {
         drop(a.accept().unwrap());
-
-        tx.send(());
     });
 
     let p = project("foo")
@@ -221,6 +213,5 @@ Caused by:
   [23] Failed to start SSH session: Failed getting banner
 ",
         addr = addr)));
-
-    rx.recv();
+    t.join().ok().unwrap();
 });

diff --git a/tests/test_cargo_build_lib.rs b/tests/test_cargo_build_lib.rs
index aab74fd117d96aa1925f3f8b591a925a673cae13..f559b53e8c8c0024ac8152e8f858cc925a9aadce 100644 (file)
--- a/tests/test_cargo_build_lib.rs
+++ b/tests/test_cargo_build_lib.rs
@@ -13,7 +13,7 @@ fn verbose_output_for_lib(p: &ProjectBuilder) -> String {
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target \
         -L {dir}{sep}target{sep}deps`
 ",

diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
index 817bcc251d0ea78fce49d7dc342ac3243de74fd0..2926d18cd77e6d0293b2c516ab929f0d632f9725 100644 (file)
--- a/tests/test_cargo_compile.rs
+++ b/tests/test_cargo_compile.rs
@@ -699,8 +699,10 @@ test!(self_dependency {
                 execs().with_status(0));
 });
 
-#[cfg(not(windows))]
 test!(ignore_broken_symlinks {
+    // windows and symlinks don't currently agree that well
+    if cfg!(windows) { return }
+
     let p = project("foo")
         .file("Cargo.toml", basic_bin_manifest("foo").as_slice())
         .file("src/foo.rs", main_file(r#""i am foo""#, &[]).as_slice())
@@ -748,11 +750,11 @@ test!(lto_build {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}main.rs --crate-name test --crate-type bin \
-        --opt-level 3 \
+        -C opt-level=3 \
         -C lto \
         --cfg ndebug \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps`
 ",
@@ -780,7 +782,7 @@ test!(verbose_build {
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target \
         -L {dir}{sep}target{sep}deps`
 ",
@@ -805,12 +807,12 @@ test!(verbose_release_build {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
-        --opt-level 3 \
+        -C opt-level=3 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps`
 ",
@@ -851,22 +853,22 @@ test!(verbose_release_build_deps {
 {compiling} foo v0.0.0 ({url})
 {running} `rustc {dir}{sep}foo{sep}src{sep}lib.rs --crate-name foo \
         --crate-type dylib --crate-type rlib -C prefer-dynamic \
-        --opt-level 3 \
+        -C opt-level=3 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release{sep}deps \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release{sep}deps \
         -L {dir}{sep}target{sep}release{sep}deps`
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
-        --opt-level 3 \
+        -C opt-level=3 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps \
         --extern foo={dir}{sep}target{sep}release{sep}deps/\

diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs
index bcce93918b27c8c353fa895df9ffc5590fd89542..51c77a072ad729faf12fa78fb812f941310fcd1a 100644 (file)
--- a/tests/test_cargo_compile_custom_build.rs
+++ b/tests/test_cargo_compile_custom_build.rs
@@ -181,7 +181,7 @@ test!(custom_build_script_rustc_flags {
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target \
         -L {dir}{sep}target{sep}deps`
 ",
@@ -694,18 +694,18 @@ test!(build_cmd_with_a_build_cmd {
 {running} `[..]a-[..]build-script-build[..]`
 {running} `rustc [..]lib.rs --crate-name a --crate-type lib -g \
     -C metadata=[..] -C extra-filename=-[..] \
-    --out-dir [..]target[..]deps --dep-info [..]fingerprint[..]dep-lib-a \
+    --out-dir [..]target[..]deps --emit=dep-info,link \
     -L [..]target[..]deps -L [..]target[..]deps`
 {compiling} foo v0.5.0 (file://[..])
 {running} `rustc build.rs --crate-name build-script-build --crate-type bin \
     -C prefer-dynamic -g \
-    --out-dir [..]build[..]foo-[..] --dep-info [..]fingerprint[..]dep-[..] \
+    --out-dir [..]build[..]foo-[..] --emit=dep-info,link \
     -L [..]target -L [..]target[..]deps \
     --extern a=[..]liba-[..].rlib`
 {running} `[..]foo-[..]build-script-build[..]`
 {running} `rustc [..]lib.rs --crate-name foo --crate-type lib -g \
     -C metadata=[..] -C extra-filename=-[..] \
-    --out-dir [..]target --dep-info [..]fingerprint[..]dep-lib-foo \
+    --out-dir [..]target --emit=dep-info,link \
     -L [..]target -L [..]target[..]deps`
 ", compiling = COMPILING, running = RUNNING).as_slice()));
 });

diff --git a/tests/test_cargo_compile_old_custom_build.rs b/tests/test_cargo_compile_old_custom_build.rs
index 725a7ad0ce924d7ce213438e77cebfa22e19ee6f..0855548d302b93fc25e6575496e0d9c29db06c51 100644 (file)
--- a/tests/test_cargo_compile_old_custom_build.rs
+++ b/tests/test_cargo_compile_old_custom_build.rs
@@ -155,7 +155,7 @@ warning: an arbitrary build command has now been deprecated.
 Failed to run custom build command for `foo v0.5.0 ({dir})`
 Process didn't exit successfully: `{}` (status=101)\n\
 --- stderr\n\
-task '<main>' panicked at 'nope', {filename}:2\n\
+thread '<main>' panicked at 'nope', {filename}:2\n\
 \n\
 ", build.bin("foo").display(), filename = format!("src{}foo.rs", path::SEP),
    dir = p.url())));
@@ -221,7 +221,7 @@ warning: an arbitrary build command has now been deprecated.
 Failed to run custom build command for `foo v0.5.0 ({dir})`
 Process didn't exit successfully: `{}` (status=101)\n\
 --- stderr\n\
-task '<main>' panicked at 'nope', {filename}:2\n\
+thread '<main>' panicked at 'nope', {filename}:2\n\
 \n\
 ", build2.bin("bar").display(), filename = format!("src{}bar.rs", path::SEP),
    dir = p.url())));

diff --git a/tests/test_cargo_cross_compile.rs b/tests/test_cargo_cross_compile.rs
index ec8d9d69d4472aadd1236dfd41d9e2ee87b1c5a8..b55cc75d9c9ed41d68d71877663cacc92a1b2b98 100644 (file)
--- a/tests/test_cargo_cross_compile.rs
+++ b/tests/test_cargo_cross_compile.rs
@@ -1,7 +1,3 @@
-// Currently the only cross compilers available via nightlies are on linux/osx,
-// so we can only run these tests on those platforms
-#![cfg(any(target_os = "linux", target_os = "macos"))]
-
 use std::os;
 use std::path;
 
@@ -15,10 +11,16 @@ fn setup() {
 }
 
 fn disabled() -> bool {
+    // First, disable if ./configure requested so
     match os::getenv("CFG_DISABLE_CROSS_TESTS") {
-        Some(ref s) if s.as_slice() == "1" => true,
-        _ => false,
+        Some(ref s) if s.as_slice() == "1" => return true,
+        _ => {}
     }
+
+    // Right now the windows bots cannot cross compile due to the mingw setup,
+    // so we disable ourselves on all but macos/linux setups where the rustc
+    // install script ensures we have both architectures
+    return !cfg!(target_os = "macos") && !cfg!(target_os = "linux");
 }
 
 fn alternate() -> &'static str {
@@ -298,7 +300,7 @@ test!(linker_and_ar {
 {compiling} foo v0.5.0 ({url})
 {running} `rustc src/foo.rs --crate-name foo --crate-type bin -g \
     --out-dir {dir}{sep}target{sep}{target} \
-    --dep-info [..] \
+    --emit=dep-info,link \
     --target {target} \
     -C ar=my-ar-tool -C linker=my-linker-tool \
     -L {dir}{sep}target{sep}{target} \

diff --git a/tests/test_cargo_profiles.rs b/tests/test_cargo_profiles.rs
index ccd29cb12a53c72ac68085cd8a7a76c7e8ffd9c4..ccf531a540f9d4b15a72421154944ad9683e30cd 100644 (file)
--- a/tests/test_cargo_profiles.rs
+++ b/tests/test_cargo_profiles.rs
@@ -28,13 +28,13 @@ test!(profile_overrides {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
-        --opt-level 1 \
+        -C opt-level=1 \
         --cfg ndebug \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         -C rpath \
         --out-dir {dir}{sep}target \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target \
         -L {dir}{sep}target{sep}deps`
 ",
@@ -83,22 +83,22 @@ test!(top_level_overrides_deps {
 {compiling} foo v0.0.0 ({url})
 {running} `rustc {dir}{sep}foo{sep}src{sep}lib.rs --crate-name foo \
         --crate-type dylib --crate-type rlib -C prefer-dynamic \
-        --opt-level 1 \
+        -C opt-level=1 \
         -g \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release{sep}deps \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release{sep}deps \
         -L {dir}{sep}target{sep}release{sep}deps`
 {compiling} test v0.0.0 ({url})
 {running} `rustc {dir}{sep}src{sep}lib.rs --crate-name test --crate-type lib \
-        --opt-level 1 \
+        -C opt-level=1 \
         -g \
         -C metadata=[..] \
         -C extra-filename=-[..] \
         --out-dir {dir}{sep}target{sep}release \
-        --dep-info [..] \
+        --emit=dep-info,link \
         -L {dir}{sep}target{sep}release \
         -L {dir}{sep}target{sep}release{sep}deps \
         --extern foo={dir}{sep}target{sep}release{sep}deps/\

diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index ff0d23c54d10b14fa8c1d20ba66afe5bcb237c39..ea1f44d6da704b2927686f9b1ae2e0f7ddaadfc9 100644 (file)
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -135,7 +135,7 @@ test test_hello ... FAILED
 failures:
 
 ---- test_hello stdout ----
-<tab>task 'test_hello' panicked at 'assertion failed: \
+<tab>thread 'test_hello' panicked at 'assertion failed: \
     `(left == right) && (right == left)` (left: \
     `hello`, right: `nope`)', src{sep}foo.rs:12
 
@@ -150,7 +150,7 @@ test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured
         COMPILING, p.url(), RUNNING,
         sep = path::SEP))
               .with_stderr(format!("\
-task '<main>' panicked at 'Some tests failed', [..]
+thread '<main>' panicked at 'Some tests failed', [..]
 "))
               .with_status(101));
 });

diff --git a/tests/tests.rs b/tests/tests.rs
index ca53267003ae3410b18997f2ad9bfe662c23c9e3..caa4d2d0bd1dd2271bfea0d0cd178de83f9cc800 100644 (file)
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -1,5 +1,6 @@
 #![feature(macro_rules)]
 #![feature(phase)]
+#![deny(warnings)]
 
 extern crate cargo;
 extern crate flate2;